From 185e83591ce420e0b004646b55c5e4783e388531 Mon Sep 17 00:00:00 2001 From: Yang Zhang Date: Tue, 7 Jan 2014 14:30:21 +0100 Subject: [PATCH] VMX,apicv: Set "NMI-window exiting" for NMI Enable NMI-window exiting if interrupt is blocked by NMI under apicv enabled platform. Signed-off-by: Yang Zhang --- xen/arch/x86/hvm/vmx/intr.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/intr.c b/xen/arch/x86/hvm/vmx/intr.c index 7757910f02..85074329aa 100644 --- a/xen/arch/x86/hvm/vmx/intr.c +++ b/xen/arch/x86/hvm/vmx/intr.c @@ -252,10 +252,11 @@ void vmx_intr_assist(void) intblk = hvm_interrupt_blocked(v, intack); if ( cpu_has_vmx_virtual_intr_delivery ) { - /* Set "Interrupt-window exiting" for ExtINT */ + /* Set "Interrupt-window exiting" for ExtINT and NMI. */ if ( (intblk != hvm_intblk_none) && - ( (intack.source == hvm_intsrc_pic) || - ( intack.source == hvm_intsrc_vector) ) ) + (intack.source == hvm_intsrc_pic || + intack.source == hvm_intsrc_vector || + intack.source == hvm_intsrc_nmi) ) { enable_intr_window(v, intack); goto out; -- 2.30.2